[ES|QL] Fix nested editor marker leaks in autocomplete and introduce a shared autocomplete parsing boundary by bartoval · Pull Request #260618 · elastic/kibana

bartoval · 2026-04-01T05:42:07Z

Summary

Disclaimer : This PR restarts following the last comment on the issue. So I’m trying to clean up the ESQL commands as a consumers, without venturing into suicide missions.

Fixes most of the remaining editor marker leak for incomplete assignments in autocomplete: so nested marker nodes are also removed from the AST.
Introduces a shared autocomplete parsing boundary to centralize query repair, parsing, cursor-context extraction, and marker cleanup.
Removes redundant marker-aware checks from command/runtime paths where they are no longer needed.
Keeps the assignment-specific fallback in getAssignmentExpressionRoot(), since incomplete RHS still needs to behave like an empty expression in cases such as RERANK ... ON col0 =.

bartoval · 2026-04-01T07:17:16Z

I was thinking about a more ambitious long-term idea (not for this PR):

Instead of using markers and cleaning them up later in Kibana, @elastic/esql could handle incomplete input directly in the AST. For example, foo = could produce { kind: 'assignment_rhs' } instead of a marker-based node.

Using location instead of marker_esql_editor would also let us classify contexts more precisely (e.g. assignment_rhs, function_argument, list_item), so consumers don’t need to know about markers.

Before that, we should verify that parser locations are reliable with incomplete input. There are already some issues, like LIKE / NOT resolving to unknown, and trailing commas resolving only to very broad nodes.

bartoval · 2026-04-01T07:20:28Z

+  if (Array.isArray(arg)) {
+    return arg.filter(isNotMarkerNodeOrArray).map(mapToNonMarkerNode);
+  }
+


Here the missing part of the task

bartoval · 2026-04-01T07:21:45Z

@@ -85,7 +84,7 @@ function getPosition(
    return { position: CompletionPosition.AFTER_COMMAND };
  }

-  const expressionRoot = prompt?.text !== EDITOR_MARKER ? prompt : undefined;


I tested this by hand, I found no side effects

bartoval · 2026-04-01T07:29:42Z

@@ -181,8 +181,7 @@ export async function autocomplete(

    case 'after_where': {
      const whereFn = command.args[command.args.length - 1] as ESQLFunction;
-      // TODO do we still need this check?
-      const expressionRoot = isMarkerNode(whereFn.args[1]) ? undefined : whereFn.args[1]!;
+      const expressionRoot = whereFn.args[1];


I did some testing by hand but the unit tests already covered it well

bartoval · 2026-04-01T07:38:04Z

+}
+
+/** Parses the query and resolves the cursor context (command, option, node). */
+export function getAutocompleteCursorContext(fullText: string, offset: number) {


It’s a weak API in the sense that it’s only used in one place at runtime and in tests. I could create a separate API for findAutocompleteAstPosition, but I’d rather not introduce more APIs and risk adding confusion.

elasticmachine · 2026-04-01T07:52:53Z

Pinging @elastic/kibana-esql (Team:ESQL)

drewdaemon

Eye candy 👏

stratoula

This looks very nice, can you fix the regex issue that was marked? Other than that I really like this

stratoula · 2026-04-13T05:48:27Z


+// After `KEY BY field,`, suggest the next KEY BY field.
+const KEY_BY_TRAILING_COMMA_REGEX = /\bkey\s+by(?:\s+\S+,)+\s*$/i;
+


@bartoval let's fix that otherwise when we merge an issue will be created. Let's fix it here

I had already fixed it here 42fc7a6 that comment refers to the first version

stratoula · 2026-04-13T05:53:18Z


  const functionExpression = expressionRoot as ESQLFunction;
-  const paramContext = buildExpressionFunctionParameterContext(functionExpression, context);
+  const startingNewParam = STARTING_NEW_PARAM_REGEX.test(innerText);


This regex is duplicated. in_function.ts is STARTING_NEW_PARAM_REGEX and stats/autocomplete.ts uses inline /,\s*$/

We could create a shared utility.

elasticmachine · 2026-04-13T16:36:33Z

💚 Build Succeeded

Buildkite Build
Commit: a819bd5

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`esql`	981	982	+1

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`kbnUiSharedDeps-srcJs`	4.2MB	4.2MB	+572.0B

History

💚 Build #426654 succeeded a9a1376
💔 Build #426442 failed 2cd0a4a
💔 Build #426226 failed f05be4b
💔 Build #426203 failed 95dbbf1
💔 Build #425791 failed 42fc7a6
💔 Build #423717 failed e20190c

cc @bartoval

bartoval self-assigned this Apr 1, 2026

bartoval added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting Feature:ES|QL ES|QL related features in Kibana Team:ESQL ES|QL related features in Kibana t// v9.4.0 labels Apr 1, 2026

bartoval changed the title ~~[ES|QL] Fix nested editor marker leaks inautocomplete~~ [ES|QL] Fix nested editor marker leaks in autocomplete and introduce a shared autocomplete parsing boundary Apr 1, 2026

bartoval force-pushed the esql-marker-cleanup-assignment branch from 26d90f2 to e53d9bd Compare April 1, 2026 07:05

bartoval commented Apr 1, 2026

View reviewed changes

Fix editor marker cleanup for autocomplete

a315d3c

bartoval force-pushed the esql-marker-cleanup-assignment branch from e53d9bd to a315d3c Compare April 1, 2026 07:27

bartoval commented Apr 1, 2026

View reviewed changes

Merge branch 'main' into esql-marker-cleanup-assignment

8fa03b5

bartoval marked this pull request as ready for review April 1, 2026 07:52

bartoval requested a review from a team as a code owner April 1, 2026 07:52

bartoval and others added 4 commits April 8, 2026 07:40

Merge branch 'main' into esql-marker-cleanup-assignment

e20190c

Merge branch 'main' into esql-marker-cleanup-assignment

ac38612

Merge branch 'main' into esql-marker-cleanup-assignment

c1723af

add USER AGENT cleanup and friends

ff555da

bartoval requested a review from drewdaemon April 10, 2026 14:34

github-advanced-security AI found potential problems Apr 10, 2026

View reviewed changes

Comment thread src/platform/packages/shared/kbn-esql-language/src/commands/registry/fuse/autocomplete.ts Fixed

Merge branch 'main' into esql-marker-cleanup-assignment

c2b2335

drewdaemon approved these changes Apr 10, 2026

View reviewed changes

clean regex

42fc7a6

bartoval added v9.5.0 and removed v9.4.0 labels Apr 13, 2026

Merge branch 'main' into esql-marker-cleanup-assignment

95dbbf1

stratoula reviewed Apr 13, 2026

View reviewed changes

bartoval and others added 2 commits April 13, 2026 08:14

share trailing command regex util

5b2e4fd

Changes from node scripts/eslint_all_files --no-cache --fix

f05be4b

stratoula approved these changes Apr 13, 2026

View reviewed changes

bartoval and others added 4 commits April 13, 2026 12:32

Merge branch 'main' into esql-marker-cleanup-assignment

2cd0a4a

Merge branch 'main' into esql-marker-cleanup-assignment

a9a1376

Merge branch 'main' into esql-marker-cleanup-assignment

02fe816

clean dead import

a819bd5

bartoval enabled auto-merge (squash) April 13, 2026 16:22

stratoula disabled auto-merge April 13, 2026 16:34

stratoula merged commit df2e76b into elastic:main Apr 13, 2026
18 of 19 checks passed

bartoval mentioned this pull request May 26, 2026

[ES|QL] Make autocomplete fully marker-free - follow up #271222

Draft


		// After `KEY BY field,`, suggest the next KEY BY field.
		const KEY_BY_TRAILING_COMMA_REGEX = /\bkey\s+by(?:\s+\S+,)+\s*$/i;

Conversation

bartoval commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

bartoval commented Apr 1, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Apr 1, 2026

Uh oh!

Uh oh!

drewdaemon left a comment

Choose a reason for hiding this comment

Uh oh!

stratoula left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticmachine commented Apr 13, 2026

💚 Build Succeeded

Metrics [docs]

Module Count

Page load bundle

History

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

bartoval commented Apr 1, 2026 •

edited

Loading